From b2b9fc97f8cddc30b2f9d5d34269a49432173919 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 6 Jun 2006 20:09:43 +0000 Subject: [PATCH] Small optimization --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtkicontheme.c | 21 +++++++++------------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b76aa5f2e1..3c423ca4d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-06-06 Matthias Clasen + + * gtk/gtkicontheme.c: Small optimization + 2006-06-05 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b76aa5f2e1..3c423ca4d6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2006-06-06 Matthias Clasen + + * gtk/gtkicontheme.c: Small optimization + 2006-06-05 Matthias Clasen * configure.in: Bump version diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 1fbe6fb843..802554f4f2 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1131,9 +1131,15 @@ static void _gtk_icon_theme_ensure_builtin_cache (void) { static gboolean initialized = FALSE; + static IconThemeDir dirs[5] = { + { ICON_THEME_DIR_THRESHOLD, 0, 16, 16, 16, 2, NULL, "16", NULL, NULL, NULL }, + { ICON_THEME_DIR_THRESHOLD, 0, 20, 20, 20, 2, NULL, "20", NULL, NULL, NULL }, + { ICON_THEME_DIR_THRESHOLD, 0, 24, 24, 24, 2, NULL, "24", NULL, NULL, NULL }, + { ICON_THEME_DIR_THRESHOLD, 0, 32, 32, 32, 2, NULL, "32", NULL, NULL, NULL }, + { ICON_THEME_DIR_THRESHOLD, 0, 48, 48, 48, 2, NULL, "48", NULL, NULL, NULL } + }; IconThemeDir *dir; - gint sizes[5] = { 16, 20, 24, 32, 48 }; - gint n_sizes = G_N_ELEMENTS (sizes); + gint n_sizes = G_N_ELEMENTS (dirs); gint i; if (!initialized) @@ -1144,16 +1150,7 @@ _gtk_icon_theme_ensure_builtin_cache (void) for (i = 0; i < n_sizes; i++) { - dir = g_new (IconThemeDir, 1); - dir->type = ICON_THEME_DIR_THRESHOLD; - dir->context = 0; - dir->size = sizes[i]; - dir->min_size = sizes[i]; - dir->max_size = sizes[i]; - dir->threshold = 2; - dir->dir = NULL; - dir->icon_data = NULL; - dir->subdir = g_strdup_printf ("%d", sizes[i]); + dir = &dir[i]; dir->cache = _gtk_icon_cache_ref (_builtin_cache); builtin_dirs = g_list_append (builtin_dirs, dir); -- 2.30.2